fix Android error and issues